Use TAP output for installed tests

diff --git a/testsuite/a11y/a11ychildren.test.in b/testsuite/a11y/a11ychildren.test.in
index 91ee1c2e66d557d069e614b38d3b83ee3a5a7b09..04475922fe65ed2279cc21667375fa814ddcb6d0 100644 (file)
--- a/testsuite/a11y/a11ychildren.test.in
+++ b/testsuite/a11y/a11ychildren.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/children --tap"
 Type=session
-
+Output=TAP

diff --git a/testsuite/a11y/a11ymisc.test.in b/testsuite/a11y/a11ymisc.test.in
index 9de025325546688ec29665af2430d69831de397a..0cbe27342bb125901fbc99a0e4cd383df9baace3 100644 (file)
--- a/testsuite/a11y/a11ymisc.test.in
+++ b/testsuite/a11y/a11ymisc.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/misc --tap"
 Type=session
-
+Output=TAP

diff --git a/testsuite/a11y/a11ytext.test.in b/testsuite/a11y/a11ytext.test.in
index fb2db7de17dfa56de4a78e3477768709c91861fa..9a9c597fd944ec7eec9dcf2785c6d40d2ad3a315 100644 (file)
--- a/testsuite/a11y/a11ytext.test.in
+++ b/testsuite/a11y/a11ytext.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/text --tap"
 Type=session
-
+Output=TAP

diff --git a/testsuite/a11y/a11ytree.test.in b/testsuite/a11y/a11ytree.test.in
index a21b61a47f31c6ca6be35d366619c22bf22ff2b0..081438d4de51c70f7eddfa5ea214f597db034e37 100644 (file)
--- a/testsuite/a11y/a11ytree.test.in
+++ b/testsuite/a11y/a11ytree.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/tree-relationships --tap"
 Type=session
-
+Output=TAP

diff --git a/testsuite/a11y/a11yutil.test.in b/testsuite/a11y/a11yutil.test.in
index ee1f6546010ed579fa856db4219e0146ff94c80f..fa6cc0bc911a630998c59b0fd7e6071858c8e617 100644 (file)
--- a/testsuite/a11y/a11yutil.test.in
+++ b/testsuite/a11y/a11yutil.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/util --tap"
 Type=session
-
+Output=TAP

diff --git a/testsuite/a11y/a11yvalue.test.in b/testsuite/a11y/a11yvalue.test.in
index deb7960ff1537619f4e0ee6b8e591449a2b3d0af..70334ac48dba0ec727a5f1a01aea793617898489 100644 (file)
--- a/testsuite/a11y/a11yvalue.test.in
+++ b/testsuite/a11y/a11yvalue.test.in
@@ -1,4 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/value --tap"
 Type=session
-
+Output=TAP

diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
index 9d43ce917bd17fb31aa9491b41870f4386f2667a..cb9546d121438a7dd671c064d40a85b7ad128087 100644 (file)
--- a/testsuite/a11y/state/Makefile.am
+++ b/testsuite/a11y/state/Makefile.am
@@ -40,7 +40,8 @@ statetest_DATA = $(testdata)
 a11ystate.test: Makefile
        $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
        echo 'Type=session-exclusive' >> $@.tmp; \
-       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --directory $(statetestdir)' >> $@.tmp; \
+       echo 'Output=TAP' >> $@.tmp; \
+       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --tap --directory $(statetestdir)' >> $@.tmp; \
        mv $@.tmp $@)
 
 testfiles = a11ystate.test

diff --git a/testsuite/css/nodes/test-css-nodes.test.in b/testsuite/css/nodes/test-css-nodes.test.in
index 611e201189a16e0fe86befcdbb0a37e17eadbf9c..98c1cc1962ac6fc08f15a3ef8a35896bdab1e639 100644 (file)
--- a/testsuite/css/nodes/test-css-nodes.test.in
+++ b/testsuite/css/nodes/test-css-nodes.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && @libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/nodes && @libexecdir@/installed-tests/gtk+/css/nodes/test-css-nodes --tap"
 Type=session
+Output=TAP

diff --git a/testsuite/css/parser/test-css-parser.test.in b/testsuite/css/parser/test-css-parser.test.in
index 91fd581cbe18517c45f5b8843579bd6ae33d9acc..132944d10d84b141c120a9ca44641070b05f5d8d 100644 (file)
--- a/testsuite/css/parser/test-css-parser.test.in
+++ b/testsuite/css/parser/test-css-parser.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/parser && @libexecdir@/installed-tests/gtk+/css/parser/test-css-parser --tap"
 Type=session
+Output=TAP

diff --git a/testsuite/css/style/test-css-style.test.in b/testsuite/css/style/test-css-style.test.in
index 6d00d8d542bed9c17f5171854de40bd0818901b9..c36aa00635b0812a51a11d572171b9763ea9ec9c 100644 (file)
--- a/testsuite/css/style/test-css-style.test.in
+++ b/testsuite/css/style/test-css-style.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && @libexecdir@/installed-tests/gtk+/css/style/test-css-style"
+Exec=/bin/sh -c "cd @libexecdir@/installed-tests/gtk+/css/style && @libexecdir@/installed-tests/gtk+/css/style/test-css-style --tap"
 Type=session
+Output=TAP

diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
index 32b018a0c312c4efbd3b3daeece6fb25651be24e..599dbba95b38e18b51c1e81f3df08b4aeb32d2ca 100644 (file)
--- a/testsuite/gdk/Makefile.am
+++ b/testsuite/gdk/Makefile.am
@@ -37,7 +37,8 @@ insttest_PROGRAMS = $(TEST_PROGS)
 %.test: %$(EXEEXT) Makefile
        $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
        echo 'Type=session' >> $@.tmp; \
-       echo 'Exec=$(insttestdir)/$<' >> $@.tmp; \
+       echo 'Output=TAP' >> $@.tmp; \
+       echo 'Exec=$(insttestdir)/$< --tap' >> $@.tmp; \
        mv $@.tmp $@)
 
 test_files = $(TEST_PROGRS:=.test)

diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
index 7d1bda4e4018931ce5ff4c9ebc05c1ca4d27a332..b6a7450c0698c4642a40fa0f04f7e58262c41933 100644 (file)
--- a/testsuite/gtk/Makefile.am
+++ b/testsuite/gtk/Makefile.am
@@ -255,7 +255,8 @@ nobase_insttest_DATA = $(test_icontheme) $(test_ui)
 %.test: %$(EXEEXT) Makefile
        $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
        echo 'Type=session' >> $@.tmp; \
-       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$<' >> $@.tmp; \
+       echo 'Output=TAP' >> $@.tmp; \
+       echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$< --tap' >> $@.tmp; \
        mv $@.tmp $@)
 
 test_files = $(TEST_PROGS:=.test)

diff --git a/testsuite/reftests/reftests-dark.test.in b/testsuite/reftests/reftests-dark.test.in
index ea3b40981f1c6b4d9f3a5f3413e2bd3874aac1e6..9ff9e21406dfa4c1b3e6b698dd7616dcb688c654 100644 (file)
--- a/testsuite/reftests/reftests-dark.test.in
+++ b/testsuite/reftests/reftests-dark.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=Adwaita:dark G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP

diff --git a/testsuite/reftests/reftests-hc.test.in b/testsuite/reftests/reftests-hc.test.in
index 74751619d483e8b05edfe1121dea316d1594af2e..ea3ae9ed849a04dc815f06603ba7c54c7954340b 100644 (file)
--- a/testsuite/reftests/reftests-hc.test.in
+++ b/testsuite/reftests/reftests-hc.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrast G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP

diff --git a/testsuite/reftests/reftests-hci.test.in b/testsuite/reftests/reftests-hci.test.in
index a6466c8b1d9fd54c66552ca47155fd5ebc94da89..d08bb983c789c4ab9a09701916dc11984542e208 100644 (file)
--- a/testsuite/reftests/reftests-hci.test.in
+++ b/testsuite/reftests/reftests-hci.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env GTK_THEME=HighContrastInverse G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP

diff --git a/testsuite/reftests/reftests.test.in b/testsuite/reftests/reftests.test.in
index 0c4d59619214cbd64619462373a98d340575e10d..6b8a42f319705e49a2a09dbca95829d341844391 100644 (file)
--- a/testsuite/reftests/reftests.test.in
+++ b/testsuite/reftests/reftests.test.in
@@ -1,3 +1,4 @@
 [Test]
-Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
+Exec=/bin/sh -c "env G_ENABLE_DIAGNOSTIC=0 @libexecdir@/installed-tests/gtk+/gtk-reftest -k --verbose --tap --output $(pwd) --directory @libexecdir@/installed-tests/gtk+/reftests"
 Type=session-exclusive
+Output=TAP

diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
index c0fc0c3cddae543474394dd6657562097531e6e0..37f7a41aa921eb67057bc69537d4edd1f7440f0b 100644 (file)
--- a/testsuite/tools/Makefile.am
+++ b/testsuite/tools/Makefile.am
@@ -36,6 +36,7 @@ nobase_insttest_DATA = $(test_simplify)
 test-simplify.test: test-simplify Makefile
        $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
        echo 'Type=session' >> $@.tmp; \
+       echo 'Output=TAP' >> $@.tmp; \
        echo 'Exec env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR="$(insttestdir)/simplify" $(insttestdir)/$<' >> $@.tmp; \
        mv $@.tmp $@)